Remove defunct compile option CONFIG_XEN_SHADOW_MODE.

It has been superceded by run-time flag
XENFEAT_auto_translated_physmap.

This patch changes behaviour slightly:
 1. set_pmd/set_pgd/set_pud always use mmu_ops, even when
    XENFEAT_writable_page_tables is available. Unclear whether
    we want to add a test to avoid this.
 2. xen_l1_entry_update always uses mmu_op. Again, could gate
    this on XENFEAT_writable_page_tables.
 3. We always pin/unpin pagetables. Could gate this on a
    new XENFEAT flag.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/buildconfigs/linux-defconfig_xen0_x86_32 b/buildconfigs/linux-defconfig_xen0_x86_32
index bc4d073c4e004d51bd0eae6addb6a98ab8958257..28f41fb28436196421081a1aeddcc6c4ea93c2a4 100644 (file)
--- a/buildconfigs/linux-defconfig_xen0_x86_32
+++ b/buildconfigs/linux-defconfig_xen0_x86_32
@@ -1317,7 +1317,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_TAP is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
 CONFIG_HAVE_ARCH_ALLOC_SKB=y

diff --git a/buildconfigs/linux-defconfig_xen0_x86_64 b/buildconfigs/linux-defconfig_xen0_x86_64
index 2478eb36e6a468a9d48346053beb938993ad53c1..c8f1c86fefb473691dd017fca5fda2acf4094453 100644 (file)
--- a/buildconfigs/linux-defconfig_xen0_x86_64
+++ b/buildconfigs/linux-defconfig_xen0_x86_64
@@ -1242,7 +1242,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_TAP is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
 CONFIG_HAVE_ARCH_ALLOC_SKB=y

diff --git a/buildconfigs/linux-defconfig_xenU_x86_32 b/buildconfigs/linux-defconfig_xenU_x86_32
index c10ab66ef95e3c99478b81306125a760794dd38b..9747064a0ff8f3285062779166e40ee578cb9273 100644 (file)
--- a/buildconfigs/linux-defconfig_xenU_x86_32
+++ b/buildconfigs/linux-defconfig_xenU_x86_32
@@ -864,7 +864,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_TAP is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
 CONFIG_HAVE_ARCH_ALLOC_SKB=y

diff --git a/buildconfigs/linux-defconfig_xenU_x86_64 b/buildconfigs/linux-defconfig_xenU_x86_64
index e2cd16bf931edcddb98b58a6c838326a5bee2406..e4e5b19a630cc233b9afa953401fda593f546c33 100644 (file)
--- a/buildconfigs/linux-defconfig_xenU_x86_64
+++ b/buildconfigs/linux-defconfig_xenU_x86_64
@@ -1142,7 +1142,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_TAP is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
 CONFIG_HAVE_ARCH_ALLOC_SKB=y

diff --git a/buildconfigs/linux-defconfig_xen_x86_32 b/buildconfigs/linux-defconfig_xen_x86_32
index a4004eee3fbe256f500b0a1e04e863e79e793332..ecfc6cbf8c02e414eed79ccdb541f9aed7a18da7 100644 (file)
--- a/buildconfigs/linux-defconfig_xen_x86_32
+++ b/buildconfigs/linux-defconfig_xen_x86_32
@@ -2999,7 +2999,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_TAP is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
 CONFIG_HAVE_ARCH_ALLOC_SKB=y

diff --git a/buildconfigs/linux-defconfig_xen_x86_64 b/buildconfigs/linux-defconfig_xen_x86_64
index 1f4a66a89b4f8b54adc1fd4a87f20c1f7d14c5f4..5fffef64a43043249c52ac19976b731e681b1a4a 100644 (file)
--- a/buildconfigs/linux-defconfig_xen_x86_64
+++ b/buildconfigs/linux-defconfig_xen_x86_64
@@ -2674,7 +2674,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_TAP is not set
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
-# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
 CONFIG_HAVE_ARCH_ALLOC_SKB=y

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
index 41a8cc4f82c3f66f24563e8218257c8d02b9178f..6f8be45843cbe2bf4a6b5fc7c5c9708c327a0fe5 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
@@ -10,9 +10,6 @@
        .ascii  ",PAE=yes"
 #else
        .ascii  ",PAE=no"
-#endif
-#ifdef CONFIG_XEN_SHADOW_MODE
-       .ascii  ",SHADOW=translate"
 #endif
        .ascii  ",LOADER=generic"
        .byte   0

diff --git a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
index 4c989b5a898f0718da332a6ec436014870ab7bde..2413c5cc4f3368ca49c161305a4a742bb6ddbe05 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
+++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
@@ -52,7 +52,6 @@
 #endif
 #endif
 
-#ifndef CONFIG_XEN_SHADOW_MODE
 void xen_l1_entry_update(pte_t *ptr, pte_t val)
 {
        mmu_update_t u;
@@ -96,7 +95,6 @@ void xen_l4_entry_update(pgd_t *ptr, pgd_t val)
        BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
 }
 #endif /* CONFIG_X86_64 */
-#endif /* CONFIG_XEN_SHADOW_MODE */
 
 void xen_machphys_update(unsigned long mfn, unsigned long pfn)
 {
@@ -181,7 +179,6 @@ void xen_invlpg_mask(cpumask_t *mask, unsigned long ptr)
 
 #endif /* CONFIG_SMP */
 
-#ifndef CONFIG_XEN_SHADOW_MODE
 void xen_pgd_pin(unsigned long ptr)
 {
        struct mmuext_op op;
@@ -253,7 +250,6 @@ void xen_pmd_unpin(unsigned long ptr)
        BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 #endif /* CONFIG_X86_64 */
-#endif /* CONFIG_XEN_SHADOW_MODE */
 
 void xen_set_ldt(unsigned long ptr, unsigned long len)
 {

diff --git a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c
index 0472b93017e27077c0af2deb4c0d52b5a5598135..adf7743fd6da962e84275873ab8bffbf68c80068 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c
@@ -402,7 +402,6 @@ void pgd_free(pgd_t *pgd)
        kmem_cache_free(pgd_cache, pgd);
 }
 
-#ifndef CONFIG_XEN_SHADOW_MODE
 void make_lowmem_page_readonly(void *va, unsigned int feature)
 {
        pte_t *pte;
@@ -500,7 +499,6 @@ void make_pages_writable(void *va, unsigned int nr, unsigned int feature)
                va = (void *)((unsigned long)va + PAGE_SIZE);
        }
 }
-#endif /* CONFIG_XEN_SHADOW_MODE */
 
 static inline void pgd_walk_set_prot(void *pt, pgprot_t flags)
 {

diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig
index a0f3a1cb8217cfd6fdb6fc317e19edfe19ae2a93..099c6ed888329b64a21b3c8663cd6e6bd38d7cc8 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig
@@ -123,13 +123,6 @@ config XEN_TPMDEV_FRONTEND
        help
          The TPM-device frontend driver.
 
-config XEN_SHADOW_MODE
-       bool "Fake shadow mode"
-       default n
-       help
-         Fakes out a shadow mode kernel
-
-
 config XEN_SCRUB_PAGES
        bool "Scrub memory before freeing it to Xen"
        default y

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
index 00bbb3ad950b58bbf7566370043e80da3dac9fb3..c72cafeb52ed36f1b335946450d16b8bb56144ed 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
@@ -76,7 +76,6 @@ void xen_load_gs(unsigned int selector); /* x86_64 only */
 void xen_tlb_flush(void);
 void xen_invlpg(unsigned long ptr);
 
-#ifndef CONFIG_XEN_SHADOW_MODE
 void xen_l1_entry_update(pte_t *ptr, pte_t val);
 void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
 void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
@@ -89,14 +88,6 @@ void xen_pmd_pin(unsigned long ptr); /* x86_64 only */
 void xen_pmd_unpin(unsigned long ptr); /* x86_64 only */
 void xen_pte_pin(unsigned long ptr);
 void xen_pte_unpin(unsigned long ptr);
-#else
-#define xen_l1_entry_update(_p, _v) set_pte((_p), (_v))
-#define xen_l2_entry_update(_p, _v) set_pgd((_p), (_v))
-#define xen_pgd_pin(_p)   ((void)0)
-#define xen_pgd_unpin(_p) ((void)0)
-#define xen_pte_pin(_p)   ((void)0)
-#define xen_pte_unpin(_p) ((void)0)
-#endif
 
 void xen_set_ldt(unsigned long ptr, unsigned long bytes);
 void xen_machphys_update(unsigned long mfn, unsigned long pfn);

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-2level.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-2level.h
index 224e2e3c95a5084fa1dbb08bb06f5d830f821f3a..d883e06607f98148dc61a0122bd2963f569925e2 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-2level.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-2level.h
@@ -31,11 +31,7 @@
 
 #define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval)
 
-#ifndef CONFIG_XEN_SHADOW_MODE
 #define set_pmd(pmdptr, pmdval) xen_l2_entry_update((pmdptr), (pmdval))
-#else
-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
-#endif
 
 #define ptep_get_and_clear(mm,addr,xp) __pte_ma(xchg(&(xp)->pte_low, 0))
 #define pte_same(a, b)         ((a).pte_low == (b).pte_low)

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h
index d4a93a8699d53a1d11f7a7c944e25bf25f35902a..547530154650287465a5913fe18e258ce169ce2b 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h
@@ -83,17 +83,10 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
        }                                                               \
 } while (0)
 
-#ifdef CONFIG_XEN_SHADOW_MODE
-# define set_pmd(pmdptr,pmdval) \
-               set_64bit((unsigned long long *)(pmdptr),pmd_val(pmdval))
-# define set_pud(pudptr,pudval) \
-               (*(pudptr) = (pudval))
-#else
-# define set_pmd(pmdptr,pmdval)                                \
+#define set_pmd(pmdptr,pmdval)                         \
                xen_l2_entry_update((pmdptr), (pmdval))
-# define set_pud(pudptr,pudval) \
+#define set_pud(pudptr,pudval) \
                xen_l3_entry_update((pudptr), (pudval))
-#endif
 
 /*
  * Pentium-II erratum A13: in PAE mode we explicitly have to flush